Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2012 03:43:00 +0000 (19:43 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2012 03:43:00 +0000 (19:43 -0800)
commit236b637fc00aa14128417a9b9bb80e72bf209795
treed385554c375d2f9926dd12e1330dd6fb146565d3
parent18b61d4152ec81a402b1139020def9f7c8998d6e
parent015cd01274d62fbe5d82a2c8cb23511081fcc5b8
Merge from trunk.
src/ChangeLog
src/window.c